From: Kenichi Handa <handa@etlken>
Date: Thu, 22 Apr 2010 04:07:11 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~691^3~425^2~209
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8404c468113fb4189fe7d884959172987d650b78;p=emacs.git

merge trunk
---

8404c468113fb4189fe7d884959172987d650b78